Fix up capture issue and rename things for clarify