fix renaming and codestyle