Exception error and tests.
Just changed the names.
Fix the variable key.
Just changed the names.
Code refactoration.