Resolved some conflicts

Resolved some conflicts with naming between java classes and mysql