rename, add crate attr, header