Fixing naming conflicts and updating Forward