CLEANUP: some additional improvements to naming conventions, etc.