Cleaned up line 430 FIXME

Using name (package name) as first arg to context.Check
Resolved line 201 FIXME

Using package name of first parsed file as first argument
to context.Check