Renaming, additions and tweaking.