Minor naming updates