Refactoring: Replace names with underscores with camelCase names