Cleaned up names used across widgets by using a dict of proper names