Moved from snake-case-thingie to camelCase