Changed requirements according to the new name giving standard.