Fix up some naming and attribute loading issues