Renamed scope to context and namespace to scope

- Also normalized argument order for appcontroller and router