Refactoring building type switch statment
Changing names of building type in argument