Minor improvements, naming changes