Fixed name override as it had a var scoping issue