Fixing naming scheme of project