Fixed the renaming issue. now need to explore if combinations are working correctly