Tiny renaming according to style conventions.