Rename for GPL compatibility