Fixed recursion & naming strategy