Replaced Procedures and Variables with typing-compatible versions