Changed project scpecific naming to a more generic one.