Added shittier naming conventions. Closes #6