D-12341 simplifying and renaming