Fix some naming conventions