Fixed idiotic variable names