Classes renamed for consistancy