Removing solar specific naming and links