Some namings changed, updates to definitions