Fixed naming conventions to follow .NET standards and some other errors