Minor naming convention changes