re#141 adjusting naming strategy and the readme to match