swapped keyword name, simplified types modules ops