Updated names and prefix addresses