A number of changes
Minor renaming