More renaming for issue #10