Fixed some issues with building names in code differing from building names in model, causing building data not to load properly