Another fix attempt for Teamcity naming errors