Fix some naming, intro bits