Refactor names of source code to be consistent.