Changed Naming Convention and Replaced Buildings