Update naming, add requirements.