rename some stuff, change order in constructors