Small refactoring: portable decorator paths, fixed base raw element name regex