rename some debug stuff for consistency/uniqueness