fix a few stuff regarding naming on building