WP name generation modified