Revert "further thoughts - changed plan for naming scheme"

This reverts commit 2a90e6b5f3620a0e143c00ff2d36a75e8f07cfaa.