lots of renaming and fixed a test typo