Constants/Naming updates

Added constants and cleaned up hard coded strings