Fixed more variables/constants/etc to the fempire, changed capitalization to make names more consistant