rpearce: Clean/Tidy and fix naming