Cleaned up naming convention

Still trying to fix the response