mass renaming
cleaned up errors and warnings