WIP - fixing mon names to be consistent

Change-Id: If6e224fe2131869d02d97d1e7736e93c65f68682