Removed interface, did some renaming, added punter and kicker implementations.
Not sure why this didn't go in the last commit.