Update commands to follow Gentoo convensions