Added requirements + some minor renames