Now conform to Building name standard as in: #57
Closes #66 for now