Amir checking in from Naveed : Rename class and a table.