Slightly altered routine names in input module