Fine tune naming and notes