Applied naming changes