User and Group tablenames to plural