Names were funky, also fixed small RIS issue