Minor naming conventions changed