Change some naming and mark additional changes needed