Require added, names fixed, updated