DP: rename a few files to get more clarity