Revert "more implementation of Edwin's renaming schema"

This reverts commit 7c0f4b53384e83291a12c69989a201d2c1b42e7d.
Revert "Starting to implement some of Edwin's notation preferences"

This reverts commit 6919a274aff2ea502d179c570bbc6f729d0eeee0.