Shortening require names
FIxing some typos