model naming changes mostly
merged master