Renamed methods in Factory.java