task: #3615493 Renaming cleanup

Jean Valverderequested to merge
issue/display_builder-3615493:3615493-layers-cleanup into 1.0.x

By: mogtofu33

Closes #3615493

Merge request reports