Some renaming
Minor changes