Complete fix for abbreviated building names, prevent double counting with class names