debug, and naming changes