Fix conceptual issue with the TableNameFormatter interface

Also made usage of the interface consistent and cleaned up
a few methods.

Change-Id: I878e4d217b32ddbfa1f387969aebba92b0bb7b6b