added changes for name prefix