Minor naming changes :)