Too many declarations check.
Naming fixes.