Update naming, remove some older debug stuff