Rename methods & fix ref counting