Change naming convention
Clean up