Fixed naming conventions through project.