#34 #66 Fix persistenceUnitName