changed shorcode names