minor renames in source code