Naming DB clean up