Stabilise naming.

software/erp5/instance-zope.cfg

@@ -46,10 +46,10 @@ bin-path = $${rootdirectory:bin}
 site-zcml = $${:instance-etc}/site.zcml
 logrotate-post = $${rootdirectory:bin}/zope-post-logrotate
 pid-file = $${basedirectory:run}/zope.pid
-lock = $${basedirectory:run}/zope.lock
+lock-file = $${basedirectory:run}/zope.lock
 event-log = $${basedirectory:log}/zope-event.log
 z2-log = $${basedirectory:log}/zope-Z2.log
-conf-file = $${rootdirectory:etc}/zope.conf
+configuration-file = $${rootdirectory:etc}/zope.conf
 inituser = $${:instance-path}/inituser
 # Binary information
 runzope-binary = ${buildout:bin-directory}/runzope