Merge branch 'jc/rename'