fixed formatting
better collection table names