Rename single holder container class and module