fixed some build issues around the rename