Bunch more refactoring. Since adapter contains insert, update, etc had to rename the logical ones