Changed static factory names to something less verbose.