Changed to use camelcase instead of underscores