Remove incorrect method, change static

method names to match naming convention.