Rename Identifier, fix bugs, add Tests