Just renaming and some simple bugfixes