Fixed all naming conventions