Went through with ReSharper

Also renamed solution