Issue 25

Change from snake_case to camelCase