Some naming corrections.