Finished renaming entities, converted spaces to tabs
Merged with other changes, tabs are now spaces
Fixed some errors from merge, tests still failing