Tweaking naming and notes