Fixed ORM src files to work with new variable names