Refactored method names and renames formspec