Name Convention

various renames and clean up