updated TODO
preliminary work on user-defined naming conventions