Rename requirements and close #20