Changed some naming conventions, probably need to diverge from main project after this change