a bit of renaming and stuff