Change name for proper prefix