Filtering of directory name same as filenames

Currently I have the following setup:

- __rootArtifactId__-test1
   - src
      - main
         - java
- __projectName__-test2
   - src
      - main
         - java
            - Test-__projectName__.java
               "This is ${projectName}!"

When I use this archetype with the required property "projectName" set to "myName" it generates:

- myArtifactId-test1
   - src
      - main
         - java
- __projectName__-test2
   - src
      - main
         - java
            - Test-myName.java
               "This is myName!"

This project builds as expected, but as you can see, the property is changed in all the filenames (thanks to ARCHETYPE-191) and Velocity changes the property in the files, but the directory isn't renamed. I would expect that the directory and module would also accept custom properties besides the usual rootArtifactId?