removed "Factrory" suffix from factory properties