Shortened some default variables to match up with wiki adjustments