Change naming convention for collections