Changed all naming conventions and roots