Source formatting

- Renaming for consistency