Refs #4311 - removing old scoped names functionality