Prepare renaming & bugfix