Some naming updates