Changed Naming Scheme and fixed warnings.