More naming cleanup
factory.h implemented