Updating naming of Factories to fit more into Java's naming scheme