tests passing
mass renames
tests passing
fix id attribute of order model