Better handling of shared/static naming issues