Added varnameuniqueness rule
Naming tweak to satisfy tslint running on itself