Fix meta-data and more descriptive name