Corrected projection building bug and applied some name refactoring