Rename files, fix feature names, add test