DOL-98 minor type renaming and enforcement