Some renaming, and new code ^^