Changed table names to consistent way