refs #319 Fixed table names and properties :(