Some more general to specific naming tweaks