Fix broken functions, rename module (closes #11).