just some renaming and other small crap