diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index c3e7cd5d8b..1f56e21e9d 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -220,11 +220,11 @@ void Foam::CLASS::write
 ) const
 {
     FVPATCHF::write(os);
-    os.writeKeyword("scalarData") << scalarData_ << token::END_STATEMENT << nl;
-    os.writeKeyword("data") << data_ << token::END_STATEMENT << nl;
+    Foam::writeEntry(os, "scalarData", scalarData_);
+    Foam::writeEntry(os, "data", data_);
     fieldData_.writeEntry("fieldData", os);
     timeVsData_->writeData(os);
-    os.writeKeyword("wordData") << wordData_ << token::END_STATEMENT << nl;
+    Foam::writeEntry(os, "wordData", wordData_);
     this->writeEntry("value", os);
 }